src: consistentify Makefile indentation/alignment

diff --git a/src/Makefile-gdmuser.am b/src/Makefile-gdmuser.am
index a12296081da7610f8afee55ec384a20ec8e69e09..caba0d89a1fe43027d607b0a829bc8412f7b79be 100644 (file)
--- a/src/Makefile-gdmuser.am
+++ b/src/Makefile-gdmuser.am
@@ -1,24 +1,24 @@
-gdmuser_cflags =                                       \
+gdmuser_cflags =                               \
        -I$(top_srcdir)/src                     \
        -DPREFIX=\""$(prefix)"\"                \
        -DLIBDIR=\""$(libdir)"\"                \
        -DDATADIR=\""$(datadir)"\"              \
        -DG_DISABLE_DEPRECATED                  \
-       -DG_LOG_DOMAIN=\"GdmUser\"                      \
+       -DG_LOG_DOMAIN=\"GdmUser\"              \
        $(GDMUSER_CFLAGS)                       \
        $(NULL)
 
 # please, keep this sorted alphabetically
-gdmuser_source_h =                                     \
-       gdmuser/gdm-user.h                              \
+gdmuser_source_h =                     \
+       gdmuser/gdm-user.h              \
        gdmuser/gdm-user-private.h      \
        gdmuser/gdm-user-manager.h      \
        $(NULL)
 
 # please, keep this sorted alphabetically
-gdmuser_source_c =                                     \
-       gdmuser/gdm-user.c                      \
-       gdmuser/gdm-user-manager.c                      \
+gdmuser_source_c =                     \
+       gdmuser/gdm-user.c              \
+       gdmuser/gdm-user-manager.c      \
        $(NULL)
 
 noinst_LTLIBRARIES += libgdmuser-1.0.la

diff --git a/src/Makefile-st.am b/src/Makefile-st.am
index 5cefa7b193e6e28a76a4808e2d96dcd0082c6321..74b023b75d77990327c13a86b3f85db706dc02c4 100644 (file)
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@@ -1,19 +1,19 @@
 st_cflags =                                    \
-    -I$(top_srcdir)/src                                \
-    -DPREFIX=\""$(prefix)"\"                   \
-    -DLIBDIR=\""$(libdir)"\"                   \
-    -DG_DISABLE_DEPRECATED                     \
-    -DG_LOG_DOMAIN=\"St\"                      \
-    -DST_COMPILATION                           \
-    -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"       \
-    $(ST_CFLAGS)                               \
-    $(NULL)
+       -I$(top_srcdir)/src                     \
+       -DPREFIX=\""$(prefix)"\"                \
+       -DLIBDIR=\""$(libdir)"\"                \
+       -DG_DISABLE_DEPRECATED                  \
+       -DG_LOG_DOMAIN=\"St\"                   \
+       -DST_COMPILATION                        \
+       -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"    \
+       $(ST_CFLAGS)                            \
+       $(NULL)
 
 st_built_sources =                             \
-    st-enum-types.h                            \
-    st-enum-types.c                            \
-    st-marshal.h                               \
-    st-marshal.c
+       st-enum-types.h                         \
+       st-enum-types.c                         \
+       st-marshal.h                            \
+       st-marshal.c
 
 BUILT_SOURCES += $(st_built_sources)
 
@@ -66,37 +66,37 @@ st-enum-types.c: stamp-st-enum-types.h st/st-enum-types.c.in
 
 # please, keep this sorted alphabetically
 st_source_h =                                  \
-    st/st-adjustment.h                         \
-    st/st-bin.h                                        \
-    st/st-border-image.h                       \
-    st/st-box-layout.h                         \
-    st/st-box-layout-child.h                   \
-    st/st-button.h                             \
-    st/st-clickable.h           \
-    st/st-clipboard.h                          \
-    st/st-container.h                          \
-    st/st-drawing-area.h        \
-    st/st-entry.h                              \
-    st/st-group.h                              \
-    st/st-im-text.h                            \
-    st/st-label.h                              \
-    st/st-overflow-box.h        \
-    st/st-private.h                            \
-    st/st-scrollable.h                         \
-    st/st-scroll-bar.h                         \
-    st/st-scroll-view.h                                \
-    st/st-shadow.h                              \
-    st/st-subtexture.h                         \
-    st/st-table.h                              \
-    st/st-table-child.h                                \
-    st/st-texture-cache.h                      \
-    st/st-theme.h                              \
-    st/st-theme-context.h                      \
-    st/st-theme-node.h                         \
-    st/st-tooltip.h                            \
-    st/st-types.h                              \
-    st/st-widget.h                             \
-    $(NULL)
+       st/st-adjustment.h                      \
+       st/st-bin.h                             \
+       st/st-border-image.h                    \
+       st/st-box-layout.h                      \
+       st/st-box-layout-child.h                \
+       st/st-button.h                          \
+       st/st-clickable.h                       \
+       st/st-clipboard.h                       \
+       st/st-container.h                       \
+       st/st-drawing-area.h                    \
+       st/st-entry.h                           \
+       st/st-group.h                           \
+       st/st-im-text.h                         \
+       st/st-label.h                           \
+       st/st-overflow-box.h                    \
+       st/st-private.h                         \
+       st/st-scrollable.h                      \
+       st/st-scroll-bar.h                      \
+       st/st-scroll-view.h                     \
+       st/st-shadow.h                          \
+       st/st-subtexture.h                      \
+       st/st-table.h                           \
+       st/st-table-child.h                     \
+       st/st-texture-cache.h                   \
+       st/st-theme.h                           \
+       st/st-theme-context.h                   \
+       st/st-theme-node.h                      \
+       st/st-tooltip.h                         \
+       st/st-types.h                           \
+       st/st-widget.h                          \
+       $(NULL)
 
 st.h: Makefile
        $(AM_V_GEN) (echo "#define ST_H_INSIDE 1";      \
@@ -107,58 +107,58 @@ st.h: Makefile
 BUILT_SOURCES += st.h
 
 st_source_private_h =                          \
-    st/st-private.h                            \
-    st/st-table-private.h                      \
-    st/st-theme-private.h                      \
-    st/st-theme-node-private.h                 \
-    st/st-theme-node-transition.h
+       st/st-private.h                         \
+       st/st-table-private.h                   \
+       st/st-theme-private.h                   \
+       st/st-theme-node-private.h              \
+       st/st-theme-node-transition.h
 
 # please, keep this sorted alphabetically
 st_source_c =                                  \
-    st/st-adjustment.c                         \
-    st/st-bin.c                                        \
-    st/st-border-image.c                       \
-    st/st-box-layout.c                         \
-    st/st-box-layout-child.c                   \
-    st/st-button.c                             \
-    st/st-clickable.c           \
-    st/st-clipboard.c                          \
-    st/st-container.c                          \
-    st/st-drawing-area.c        \
-    st/st-entry.c                              \
-    st/st-group.c                              \
-    st/st-im-text.c                            \
-    st/st-label.c                              \
-    st/st-overflow-box.c        \
-    st/st-private.c                            \
-    st/st-scrollable.c                         \
-    st/st-scroll-bar.c                         \
-    st/st-scroll-view.c                                \
-    st/st-shadow.c                              \
-    st/st-subtexture.c                         \
-    st/st-table.c                              \
-    st/st-table-child.c                                \
-    st/st-texture-cache.c                      \
-    st/st-theme.c                              \
-    st/st-theme-context.c                      \
-    st/st-theme-node.c                         \
-    st/st-theme-node-drawing.c         \
-    st/st-theme-node-transition.c              \
-    st/st-tooltip.c                            \
-    st/st-widget.c                             \
-    $(NULL)
+       st/st-adjustment.c                      \
+       st/st-bin.c                             \
+       st/st-border-image.c                    \
+       st/st-box-layout.c                      \
+       st/st-box-layout-child.c                \
+       st/st-button.c                          \
+       st/st-clickable.c                       \
+       st/st-clipboard.c                       \
+       st/st-container.c                       \
+       st/st-drawing-area.c                    \
+       st/st-entry.c                           \
+       st/st-group.c                           \
+       st/st-im-text.c                         \
+       st/st-label.c                           \
+       st/st-overflow-box.c                    \
+       st/st-private.c                         \
+       st/st-scrollable.c                      \
+       st/st-scroll-bar.c                      \
+       st/st-scroll-view.c                     \
+       st/st-shadow.c                          \
+       st/st-subtexture.c                      \
+       st/st-table.c                           \
+       st/st-table-child.c                     \
+       st/st-texture-cache.c                   \
+       st/st-theme.c                           \
+       st/st-theme-context.c                   \
+       st/st-theme-node.c                      \
+       st/st-theme-node-drawing.c              \
+       st/st-theme-node-transition.c           \
+       st/st-tooltip.c                         \
+       st/st-widget.c                          \
+       $(NULL)
 
 noinst_LTLIBRARIES += libst-1.0.la
 
 libst_1_0_la_LIBADD = -lm $(ST_LIBS)
 libst_1_0_la_SOURCES =                         \
-    $(st_source_c)                             \
-    $(st_source_private_h)                     \
-    $(st_source_private_c)                     \
-    $(st_source_h)                             \
-    st.h                                       \
-    $(st_built_sources)                                \
-    $(NULL)
+       $(st_source_c)                          \
+       $(st_source_private_h)                  \
+       $(st_source_private_c)                  \
+       $(st_source_h)                          \
+       st.h                                    \
+       $(st_built_sources)                     \
+       $(NULL)
 libst_1_0_la_CPPFLAGS = $(st_cflags)
 libst_1_0_la_LDFLAGS = $(LDADD)
 

diff --git a/src/Makefile-tray.am b/src/Makefile-tray.am
index 64e397f0734efb8e5d25c88d60c7ced05c2933af..6634324f853f3c96c79dd825484c34de9a3064f7 100644 (file)
--- a/src/Makefile-tray.am
+++ b/src/Makefile-tray.am
@@ -6,7 +6,7 @@ tray_cflags =                                   \
        $(NULL)
 
 tray_built_sources = \
-       na-marshal.h            \
+       na-marshal.h \
        na-marshal.c
 
 BUILT_SOURCES += $(tray_built_sources)
@@ -45,7 +45,7 @@ na-marshal.c: Makefile tray/na-marshal.list
 noinst_LTLIBRARIES += libtray.la
 
 libtray_la_LIBADD = $(TRAY_LIBS)
-libtray_la_SOURCES =   \
+libtray_la_SOURCES =           \
        $(tray_source)          \
        $(tray_built_sources)   \
        $(NULL)

diff --git a/src/Makefile.am b/src/Makefile.am
index 79449faf38197600d8c5900b8a587121de2aa90e..9d60ec7b317ccf1e5b91ff57bbb73d8edb2aef05 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,7 @@ include Makefile-tray.am
 
 gnome_shell_cflags =                           \
        $(MUTTER_PLUGIN_CFLAGS)                 \
-        $(LIBGNOMEUI_CFLAGS)                    \
+       $(LIBGNOMEUI_CFLAGS)                    \
        -I$(srcdir)/tray                        \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\" \
@@ -78,7 +78,7 @@ shell_public_headers_h =              \
        shell-tray-manager.h            \
        shell-uri-util.h                \
        shell-window-tracker.h          \
-       shell-wm.h              \
+       shell-wm.h                      \
        shell-xfixes-cursor.h
 
 libgnome_shell_la_SOURCES =            \
@@ -89,7 +89,7 @@ libgnome_shell_la_SOURCES =           \
        shell-global-private.h          \
        shell-jsapi-compat-private.h    \
        shell-window-tracker-private.h  \
-       shell-wm-private.h      \
+       shell-wm-private.h              \
        gnome-shell-plugin.c            \
        gtk-compat.h                    \
        shell-app.c                     \
@@ -110,7 +110,7 @@ libgnome_shell_la_SOURCES =         \
        shell-tray-manager.c            \
        shell-uri-util.c                \
        shell-window-tracker.c          \
-       shell-wm.c              \
+       shell-wm.c                      \
        shell-xfixes-cursor.c
 
 libgnome_shell_la_gir_sources = \
@@ -184,9 +184,10 @@ shell-enum-types.c: shell-enum-types.c.in stamp-shell-enum-types.h
 EXTRA_DIST += shell-enum-types.c.in
 
 libgnome_shell_la_LDFLAGS = -avoid-version -module
-libgnome_shell_la_LIBADD =-lm \
+libgnome_shell_la_LIBADD =     \
+       -lm                     \
        $(MUTTER_PLUGIN_LIBS)   \
-        $(LIBGNOMEUI_LIBS)      \
+       $(LIBGNOMEUI_LIBS)      \
        libst-1.0.la            \
        libgdmuser-1.0.la       \
        libtray.la
@@ -205,9 +206,9 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) St-1.0.gir libgnome-shell.la Makefile
                --include=Clutter-1.0                   \
                --include=ClutterX11-1.0                \
                --include=Meta-2.91                     \
-               --libtool="$(LIBTOOL)"    \
-               --add-include-path=$(builddir)     \
-               --include=St-1.0     \
+               --libtool="$(LIBTOOL)"                  \
+               --add-include-path=$(builddir)          \
+               --include=St-1.0                        \
                --program=mutter                        \
                --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
                $(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources)) \
@@ -263,8 +264,8 @@ Gdm-1.0.gir: $(mutter) $(G_IR_SCANNER) libgdmuser-1.0.la Makefile
                --libtool="$(LIBTOOL)"                  \
                --library=libgdmuser-1.0.la             \
                $(filter-out %-private.h, $(addprefix $(srcdir)/,$(gdmuser_source_h)))  \
-               $(addprefix $(srcdir)/,$(gdmuser_source_c))     \
-               $(gdmuser_cflags)                               \
+               $(addprefix $(srcdir)/,$(gdmuser_source_c)) \
+               $(gdmuser_cflags)                       \
                -o $@
 CLEANFILES += Gdm-1.0.gir